gdk: Remove unused macros from build

Both ALL_FILES and INCLUDE_VARIABLES don't exist anymore

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index bc0f00245b6ebca51af5698e9fd9e40236fd188c..9a48fe804221ec1b4d130728b0d0d0e7999e2471 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -278,7 +278,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX

diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index f4e9ace9e81a6382f481e4f795552e85bde39c2d..a33eef8e59590653c6acd5ad9559164c3cc036c4 100755 (executable)
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+cpp -P -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 648427c822932ae9f3f81c8b8276b66cb2414ab8..49c597861030a633e0db577bdd0684cf31d139b3 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -132,7 +132,7 @@ gdkconfig.h : gdkconfig.h.win32
 
 gdk.def: gdk.symbols
        echo EXPORTS > gdk.def
-       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 -DALL_FILES \
+       cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \
                -DG_GNUC_CONST= \
                gdk.symbols >> gdk.def